misc fixes
Merge branch 'master' into ice-cream-sandwich