Imported Upstream version 2.67-1