Merge branch 'dev'
v2.1.3 - fixed scroll bug
Merge branch 'master' into dev