merge from tangjun 2013-11-14