Merge branch 'hotfix/1.0.18'
authorIan Weller <ian@gaslightmedia.com>
Tue, 3 May 2016 18:07:01 +0000 (14:07 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 3 May 2016 18:07:01 +0000 (14:07 -0400)

Trivial merge