Merge branch 'hotfix/1.1.18' v1.1.18
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 31 Oct 2016 19:24:46 +0000 (15:24 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 31 Oct 2016 19:24:46 +0000 (15:24 -0400)

Trivial merge