Merge branch 'hotfix/1.0.6' v1.0.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 8 May 2017 16:52:58 +0000 (12:52 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 8 May 2017 16:52:58 +0000 (12:52 -0400)

Trivial merge