Merge branch 'hotfix/1.0.11' v1.0.11
authorIan Weller <ian@gaslightmedia.com>
Thu, 18 May 2017 20:38:08 +0000 (16:38 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 18 May 2017 20:38:08 +0000 (16:38 -0400)

Trivial merge