Merge upstream git://git.code.sf.net/p/modwaklog/code