Get rid of legacy inconsistency
Merge branch 'master' of github.com:PowerMeMobile/just_mini