Safari flexbox support
Merge branch 'dev' into v2.0
Merge branch 'v2.0'