Merging...
Further merges ...
Merge branch 'upstream-merge-24042013'