Another mass commit... again
Merge branch 'master' of https://github.com/bnhymn/yaff