Imported Upstream version 2013.06.33
Merge tag 'upstream/2013.06.33'

Upstream version 2013.06.33