Imported Upstream version 0.9.15
Merge tag 'upstream/0.9.15'

Upstream version 0.9.15