Applied Gabriel Carleton-Barnes' patch for #3382970
added 1 commit
Compare with previous version
merged