This merges develop into master.

Note, it may look messy but it does the right thing. :)