apache master merge 2014/10/17