Fix bitmap enum issue
Merge branch 'master' into feature/nitori_bitmap
Remove old debugging code