Merge Apache Master 2014/12/04