Merge changes from the 2.6.0 release.
View differences: inline side by side
Also available in: Unified diff
Merge changes from the 2.6.0 release.