Merge branch 'master' into zobel-salsa