Merge branch 'hotfix/1.0.6' v1.0.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 25 Jan 2017 13:06:56 +0000 (08:06 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 25 Jan 2017 13:06:56 +0000 (08:06 -0500)

Trivial merge