Merge branch 'hotfix/1.1.8' v1.1.8
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 28 Nov 2016 13:46:02 +0000 (08:46 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 28 Nov 2016 13:46:02 +0000 (08:46 -0500)

Trivial merge