Imported Upstream version 0.9.3
Merge tag 'upstream/0.9.3'

Upstream version 0.9.3
New upstream release