Merge branch 'hotfix/1.0.6' v1.0.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 15 Sep 2017 16:50:03 +0000 (12:50 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 15 Sep 2017 16:50:03 +0000 (12:50 -0400)

Trivial merge