contrib modules to promote to mainline for 2.5?