r3975 Merging of #3968: