Merge branch 'trunk' into 'master'

linter move, fix branch name

See merge request ansible/ansible!9