This merges a rebased-on-master version of 'development'

branch. Because the rebase process required re-writing some of the
commit history (due to some code being moved around upstream), this
doesn't merge cleanly, and some manual merge resolution was neccesary.