minor fix for 34df51cd5cfa6ce4aaa474930b2706eeebdfe3d8
Merge branch 'test' into 1.4.5