Imported Upstream version 1.7.38
Imported Upstream version 1.7.39