Sorry, my previous commit was made with files from Release Candidate. Reported by: Ion-Mihai Tetcu <itetcu@apropo.ro>