Merge branch 'add_chore_capabilities'
Allow bugfix branches
Rename bugfix to bug
Merge branch 'master' into add_chore_capabilities