Merge branch 'master' into trusty (backporting pigeonhole bugfixes)