Imported Upstream version 0.17