Commit fad7f7a2d941e8c7b774f0e3822fb5a367a63591

Edward Thomson 2017-07-24T13:10:43

travis: use trusty (cherry picked from commit 4da38193c568ca3842bc1130c82e7a9f955f23aa)