Merge branch 'hotfix/1.0.6' v1.0.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 16 Jun 2017 20:06:52 +0000 (16:06 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 16 Jun 2017 20:06:52 +0000 (16:06 -0400)

Trivial merge