Code

Merged branch 'upstream-1.3' into upstream.