Troubleshooting multi-column layout on iOS.
Merge branch 'master' into gh-pages