Merge branch 'hotfix/1.1.14' v1.1.14
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 3 Aug 2017 16:56:36 +0000 (12:56 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 3 Aug 2017 16:56:36 +0000 (12:56 -0400)

Trivial merge