Merge remote-tracking branch 'github/pr/35'
authorPeter Donald <peter@realityforge.org>
Sun, 18 Nov 2018 10:48:13 +0000 (21:48 +1100)
committerPeter Donald <peter@realityforge.org>
Sun, 18 Nov 2018 10:48:13 +0000 (21:48 +1100)

Trivial merge