Merge branch 'hotfix/1.0.30' v1.0.30
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 30 Aug 2016 15:59:58 +0000 (11:59 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 30 Aug 2016 15:59:58 +0000 (11:59 -0400)

Trivial merge