Fix sanitisation of controller/actions names
Merge branch 'staging'