Merge branch 'master' into dev
2.1.0 - renamed onSelect to onChange
Merge branch 'master' into dev
Merge branch 'dev'
Merge branch 'master' into gh-pages