Update to 4.1.20
Merged Gantry 4.1.20