Adjust trunk version back to 2.9-SNAPSHOT as discussed in http://markmail.org/message/ab5wdurinfx3etv3