Merge branch 'aubiocmd'