keep this changes from defunct variants branch
Merge branch 'master' into keep
publish new version to npmjs.org