Merge branch 'hotfix/1.0.12' v1.0.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 1 Jun 2016 13:55:54 +0000 (09:55 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 1 Jun 2016 13:55:54 +0000 (09:55 -0400)

Trivial merge