Merge branch 'hotfix/1.0.32' v1.0.32
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Oct 2016 20:07:27 +0000 (16:07 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Oct 2016 20:07:27 +0000 (16:07 -0400)

Trivial merge