Merge branch 'hotfix/1.0.5' v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 May 2016 19:33:38 +0000 (15:33 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 May 2016 19:33:38 +0000 (15:33 -0400)

Trivial merge