Imported Upstream version 0.12