Fix the fix for #209
Merge branch '1.2' into 1.3
Merge branch '1.3'