Imported Upstream version 0.4.16