Imported Upstream version 0.5.16
Merge tag 'upstream/0.5.16'

Upstream version 0.5.16