Merge branch 'hotfix/1.1.18' v1.1.18
authorIan Weller <ian@gaslightmedia.com>
Thu, 18 Aug 2016 19:36:22 +0000 (15:36 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 18 Aug 2016 19:36:22 +0000 (15:36 -0400)

Trivial merge