rebased onto 475fce92818ad9aeb8de9f3fa8458d7b174031cc
rebased onto ce68cc7a2edd5eda58e62f432393971023095d71
:thumbsup:
Going to remove these two before merging
rebased onto afc268a69975830c6e54d886e93350fe90639d16
Pull-Request has been merged by pingou