might as well use latest jeweler
Merge branch 'master' into forked_stuff