20141102:merge