Merge branch '1.3.2'
authorSam <sam.saffron@gmail.com>
Wed, 25 May 2016 04:02:24 +0000 (14:02 +1000)
committerSam <sam.saffron@gmail.com>
Wed, 25 May 2016 04:02:24 +0000 (14:02 +1000)

Trivial merge