Imported Upstream version 1.30