merge from trunk
Merge branch 'master' of https://github.com/shymonk/logcrawler