Merge Apache master 2014/10/31