Merge branch 'master' into dev
2.0.6 Minified
Merge branch 'dev'
Merge branch 'master' into gh-pages