Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into 1.9.x-stable
Conflicts: ChangeLog.md
- Loading branch information
Conflicts: ChangeLog.md