Merge branch 'hotfix/1.0.12' v1.0.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 25 Apr 2017 13:05:54 +0000 (09:05 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 25 Apr 2017 13:05:54 +0000 (09:05 -0400)

Trivial merge