Imported Upstream version 2.1.8.20130723
Merge tag 'upstream/2.1.8.20130723'

Upstream version 2.1.8.20130723