replaceAll replaced with a simple function
Merge branch 'master' into ice-cream-sandwich
better cover finding code
Merge branch 'master' into ice-cream-sandwich