v 2.5 RC 4, merged into master