Merge branch 'hotfix/1.0.32' v1.0.32
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 12 Jan 2017 14:10:35 +0000 (09:10 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 12 Jan 2017 14:10:35 +0000 (09:10 -0500)

Trivial merge