Cherry-pick "Merge branch 'SourceHandlingUpdate-1.0-20180313' into '1.0'" into master
Source Handling Update, 1.0 branch (2018.03.13.)
See merge request !258 (merged)
(cherry picked from commit fbef7068)
- 586f2eb5 Ignoring a possible .git/ directory, and backup (*~) files during