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)

Trivial merge