r2606: adding missing commits :-(