Imported Upstream version 2014.01.17.2
Merge tag 'upstream/2014.01.17.2'

Upstream version 2014.01.17.2
Update changelog.

Git-Dch: Ignore