Merge branch 'master' of github.com:jcw/jeelib
Merge branch 'master' of github.com:jcw/jeelib