Fix iOS layout problems cause by image height css property.
Merge branch 'master' into gh-pages