Fixed flex props for Safari & Safari Mobile
Merge branch 'master' into gh-pages