Imported Upstream version 2013.08.17
Merge tag 'upstream/2013.08.17'

Upstream version 2013.08.17
Update changelog.

Git-Dch: Ignore.
Update changelog.

Git-Dch: Ignore