understand 'px' and 'pt' as described in standard
Merge branch 'master' into ice-cream-sandwich