Merge branch 'hotfix/1.0.6' v1.0.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 6 Sep 2017 13:47:06 +0000 (09:47 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 6 Sep 2017 13:47:06 +0000 (09:47 -0400)

Trivial merge