tablet compliant
Merge branch 'tablet'