Imported Upstream version 0.9.12.0