Imported Upstream version 1.3.6