Update to trusty
Merge branch 'master' into 8