Merge 1.9.2 changes back into the trunk
View differences: inline side by side
Also available in: Unified diff
Merge 1.9.2 changes back into the trunk