Merge branch 'hotfix/1.0.6'
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 11 Jul 2016 19:27:49 +0000 (15:27 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 11 Jul 2016 19:27:49 +0000 (15:27 -0400)

Trivial merge