Merge branch 'hotfix/1.0.5' v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 13 Nov 2017 16:54:03 +0000 (11:54 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 13 Nov 2017 16:54:03 +0000 (11:54 -0500)

Trivial merge