HALO mods (2/2) - by Paranoid Android
Merge branch 'jb-mr2-HALO' into jb-mr2