Merge tag 'upstream/1.0.5'

Upstream version 1.0.5