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

Trivial merge