Merge branch 'hotfix/1.0.12' v1.0.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Feb 2017 15:01:49 +0000 (10:01 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Feb 2017 15:01:49 +0000 (10:01 -0500)

Trivial merge