some omissions from orig. buspot delivery
indent error fix
Merge branch 'master' into next