Merge branch 'hotfix/1.0.14' v1.0.14
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 11 Oct 2017 17:22:13 +0000 (13:22 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 11 Oct 2017 17:22:13 +0000 (13:22 -0400)

Trivial merge