Imported Upstream version 2013.06.26
Merge tag 'upstream/2013.06.26'

Upstream version 2013.06.26
Update changelog.

Git-Dch: Ignore