Merge branch 'master' into ha (v0.12)