Merge branch 'hotfix/1.1.8' v1.1.8
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 18:02:02 +0000 (14:02 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 18:02:02 +0000 (14:02 -0400)

Trivial merge