Merge back from develop

Touchy subject.