Merge branch 'develop'
restore importOnce instead of define, as it is more clear to users
Merge branch 'master' into gh-pages