Merge branch 'master' into raspi (no conflicts)