Merge remote-tracking branch 'upstream/trunk' into trunk
Merge branch 'trunk' into gsoc