r1027: segfault caused by the last commit
Merge branch 'dev'