Merge branch 'hotfix/1.0.12' v1.0.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 23 Jun 2016 17:19:33 +0000 (13:19 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 23 Jun 2016 17:19:33 +0000 (13:19 -0400)

Trivial merge