Merge branch 'master' of github.com:tokuhirom/kiji
C89 compliant