#1858: re-apply patch for this, adding the missing files
11 files changed