Imported Upstream version 2013.12.23
Merge tag 'upstream/2013.12.23'

Upstream version 2013.12.23