Merge branch 'hotfix/1.0.6' v1.0.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 27 May 2016 15:05:01 +0000 (11:05 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 27 May 2016 15:05:01 +0000 (11:05 -0400)

Trivial merge