Merge branch 'hotfix/1.0.31' v1.0.31
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 18:33:16 +0000 (14:33 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 18:33:16 +0000 (14:33 -0400)

Trivial merge