Merge branch 'hotfix/1.0.11' v1.0.11
authorIan Weller <ian@gaslightmedia.com>
Wed, 21 Jun 2017 19:15:47 +0000 (15:15 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 21 Jun 2017 19:15:47 +0000 (15:15 -0400)

Trivial merge