Merge branch 'hotfix/1.1.8' v1.1.8
authorIan Weller <ian@gaslightmedia.com>
Mon, 13 Feb 2017 22:10:10 +0000 (17:10 -0500)
committerIan Weller <ian@gaslightmedia.com>
Mon, 13 Feb 2017 22:10:10 +0000 (17:10 -0500)

Trivial merge