Merge "Renaming or moving files should initiate scan." into qt-dev