Imported Upstream version 2013.10.23
Merge tag 'upstream/2013.10.23'

Upstream version 2013.10.23
Update changelog.

Git-Dch: Ignore