Merge/2.10.x to master 20141219