Merge branch 'hotfix/1.0.6' v1.0.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 4 Aug 2016 17:00:07 +0000 (13:00 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 4 Aug 2016 17:00:07 +0000 (13:00 -0400)

Trivial merge