Merge branch 'hotfix/1.2.32' v1.2.32
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 5 Aug 2016 16:24:13 +0000 (12:24 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 5 Aug 2016 16:24:13 +0000 (12:24 -0400)

Trivial merge