pull Bleeding edge back into master

This is the big one!

As the 0.5 release has been cut and the default branch is now legacy (itself a branch of master from a few days ago) we are ready to move to the new development model.