Merge master

`master` has been a lot more active than `3.0-development` lately...