Merge apache master branch to trunk. (commitId: 10c599f4b057308eca7ac8d5d7cc2542a69f0524)