Merge branch 'hotfix/1.1.16' v1.1.16
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 7 Aug 2017 15:40:03 +0000 (11:40 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 7 Aug 2017 15:40:03 +0000 (11:40 -0400)

Trivial merge