Merge
authorBryan O'Sullivan <bos@serpentine.com>
Tue, 27 Jun 2017 00:20:07 +0000 (01:20 +0100)
committerBryan O'Sullivan <bos@serpentine.com>
Tue, 27 Jun 2017 00:20:07 +0000 (01:20 +0100)

Trivial merge