apache master merge 2014/09/30

apache master merge 2014/09/30