Merge from default. travis
authorDavid Given <dg@cowlark.com>
Sun, 30 Oct 2016 14:53:26 +0000 (15:53 +0100)
committerDavid Given <dg@cowlark.com>
Sun, 30 Oct 2016 14:53:26 +0000 (15:53 +0100)
commit9b6a5e3ae71431ce0dedf74ca5e9dfab5f0cf5b8
treeefd7d2e45132d6153610b080e6a7bf1d1f08b4e4
parenta5990289a9194a1934ebc85a845bce5609ab27da
parent34c4cfee8fc9da74f6ce92b8ed0c77f4f6884daf
Merge from default.