Merge branch 'master' into experimental
Merge branch 'highlighter' of https://github.com/vita10gy/ingress-intel-total-conversion into experimental