Imported Upstream version 2013.08.02
Merge tag 'upstream/2013.08.02'

Upstream version 2013.08.02