Imported Upstream version 5.1