Merge branch 'hotfix/1.0.5' master v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Mar 2018 16:46:43 +0000 (11:46 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Mar 2018 16:46:43 +0000 (11:46 -0500)

Trivial merge