Resync development & master branches

[domodwyer]

In an attempt to prevent the ridiculous diffs on GitHub a new development branch has been cut from the current master head (896bbb8).

The old development branch is preserved as old-development for the time being to allow anyone who had pinned to a commit to use it, and the existing changes from master have been cherry picked to the new development branch so anyone using a branch name as a pin should also be covered.

This issue is here to point to if anything goes horribly wrong.