Imported Upstream version 0.15.0
Imported Upstream version 17.5