Merge branch 'master' into dev
v2.1.1 - Safari bug fix
Bump version number
Merge branch 'dev'