Imported Upstream version 2013.01.09
Merge tag 'upstream/2013.01.09'

Upstream version 2013.01.09
log changes