Merge from upstream.
authorDavid Given <dg@cowlark.com>
Tue, 20 Oct 2015 17:23:28 +0000 (19:23 +0200)
committerDavid Given <dg@cowlark.com>
Tue, 20 Oct 2015 17:23:28 +0000 (19:23 +0200)

Trivial merge