Manual merge from master

Merge was failing for some reason. So just commit the latest. :-(