Merge master into development branch.

...for hopefully the last time :)