Don't know why this update didn't get picked up
Merge branch 'master' into edge