Sync from upstream SVN, version 1396.
14 files changed