Fixed regression intro'd in last commit
Merge branch 'master' into wip/725765-desktop