Merge branch 'hotfix/1.0.5' v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 5 Jul 2017 19:42:23 +0000 (15:42 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 5 Jul 2017 19:42:23 +0000 (15:42 -0400)

Trivial merge