Merge branch 'hotfix/1.0.5' v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 8 May 2017 15:22:35 +0000 (11:22 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 8 May 2017 15:22:35 +0000 (11:22 -0400)

Trivial merge