Merging 2.3.0 into master

Waited too long to do this :-T