Handle custom actions correctly
Merge branch 'master' of https://github.com/Scarygami/mirror-api