Merge branch 'hotfix/1.1.8' v1.1.8
authorIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 19:21:17 +0000 (15:21 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 19:21:17 +0000 (15:21 -0400)

Trivial merge