Merge branch 'hotfix/1.0.6' v1.0.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 12 Jul 2017 15:20:06 +0000 (11:20 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 12 Jul 2017 15:20:06 +0000 (11:20 -0400)

Trivial merge