Proposal to merge rc into master for new release

Let's see how this goes on travis. @sunny @jamieoliver please let us know if this looks ok to you!