Merge branch 'hotfix/1.0.12' v1.0.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 2 Nov 2016 15:26:58 +0000 (11:26 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 2 Nov 2016 15:26:58 +0000 (11:26 -0400)

Trivial merge