Merge branch 'master' of github.com:wolever/parameterized into master