Merge branch 'hotfix/1.1.18' v1.1.18
authorIan Weller <ian@gaslightmedia.com>
Tue, 10 May 2016 20:36:23 +0000 (16:36 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 10 May 2016 20:36:23 +0000 (16:36 -0400)

Trivial merge