Merge branch 'hotfix/1.0.11' v1.0.11
authorIan Weller <ian@gaslightmedia.com>
Mon, 30 Jan 2017 19:03:29 +0000 (14:03 -0500)
committerIan Weller <ian@gaslightmedia.com>
Mon, 30 Jan 2017 19:03:29 +0000 (14:03 -0500)

Trivial merge