Merge branch 'hotfix/1.0.12' v1.0.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 23 May 2017 13:14:10 +0000 (09:14 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 23 May 2017 13:14:10 +0000 (09:14 -0400)

Trivial merge