Merge remote-tracking branch 'origin/pr/9'
authorPeter Donald <peter@realityforge.org>
Thu, 31 Jul 2014 05:11:18 +0000 (15:11 +1000)
committerPeter Donald <peter@realityforge.org>
Thu, 31 Jul 2014 05:11:18 +0000 (15:11 +1000)

Trivial merge