Merge branch 'hotfix/1.0.5' v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Jun 2017 14:31:27 +0000 (10:31 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Jun 2017 14:31:27 +0000 (10:31 -0400)

Trivial merge