merge of trunk to the security branch
View differences: inline side by side
Also available in: Unified diff
merge of trunk to the security branch