Merge remote-tracking branch 'origin/v2.10.6-bug100770-inotify-leak' into release-v2.10-patches