Another fix forgotten in the last commit
Merge branch 'master' into trusty