Merge branch 'master' into v1.3.5
fix another bug where connection needs to be _connection
Merge branch 'refs/heads/v1.3.5'