[#654] Merging develop into release/candidate for testing

@osgl Can you merge? Ready for testing, only the release notes will have to be added by @adriancollier next week..