Merge from master.
authorDavid Given <dg@cowlark.com>
Sun, 15 Mar 2015 22:56:11 +0000 (23:56 +0100)
committerDavid Given <dg@cowlark.com>
Sun, 15 Mar 2015 22:56:11 +0000 (23:56 +0100)

Trivial merge