Changes to 'refs/tags/3.11.7'