Merge branch 'hotfix/1.0.6' v1.0.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 May 2016 20:30:11 +0000 (16:30 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 May 2016 20:30:11 +0000 (16:30 -0400)

Trivial merge