move to branch xhh 2013-5-29