Merge branch 'mobile' into gh-pages