Try re-ordering to work around ansible bug
Merge branch 'bugfix'