2.5.11dev
misc fixes