fixes #2005
Merge branch 'mobile-stylesheet'