Import patch thomas.2

(Logical change 1.148)
1 file changed