chrome 38 repain fixes.. tried cherry-pick.. i don't have time for that
Merge branch 'master' into develop