Merge branch 'hotfix/1.0.27'
authorIan Weller <ian@gaslightmedia.com>
Wed, 10 Aug 2016 20:38:54 +0000 (16:38 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 10 Aug 2016 20:38:54 +0000 (16:38 -0400)

Trivial merge