Merge branch 'hotfix/1.1.17' v1.1.17
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 7 Aug 2017 20:12:02 +0000 (16:12 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 7 Aug 2017 20:12:02 +0000 (16:12 -0400)

Trivial merge