Merge Apache Master 2014/11/17