Don't use expression closures
Merge branch 'master' into gh-pages