Merge branches 'master' and 'master' of git@github.com:savila/halogen.c