IfolderRu: fixed #267
Merge remote-tracking branch 'upstream/stable' into testing