Merge branch 'hotfix/1.0.12' v1.0.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 13 Jul 2016 12:33:32 +0000 (08:33 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 13 Jul 2016 12:33:32 +0000 (08:33 -0400)

Trivial merge