Imported Upstream version 0.9.16