Merge remote-tracking branch 'origin/3.18.x'
authorLiz Rea <wizzyrea@gmail.com>
Mon, 19 Oct 2015 21:06:26 +0000 (10:06 +1300)
committerLiz Rea <wizzyrea@gmail.com>
Mon, 19 Oct 2015 21:06:26 +0000 (10:06 +1300)

Trivial merge