haitao d26f94e853 merger 1 rok pred
..
includes 24c6dd89d8 fist commit 1 rok pred
sources d26f94e853 merger 1 rok pred