update hrabak branch to 2.5hrabak10. not yet tested / reviewed