Merge branch 'master' of https://github.com/r-lyeh/knot into HEAD