Merge branch 'newparser' of git://repo.or.cz/mistral into newparser