force-complete patch for 0.9.95_plus_patch branch
Merge pull request #5367 from ticoann/0.9.95b_plus_patches

force-complete patch for 0.9.95_plus_patch branch