possible fix for knobs
Merge branch 'master' into gh-pages
version bump
Merge branch 'master' into gh-pages