5.4 compat
Merge branch 'master' of https://github.com/moonwitch/Eavu