Imported Upstream version 2013.10.04
Merge tag 'upstream/2013.10.04'

Upstream version 2013.10.04
Update changelog.

Git-Dch: Ignore
Add bug number that we are closing.

Git-Dch: Ignore
Finalize changelog.

Git-Dch: Ignore