Merge branch 'v4.1' into devel
Merge remote-tracking branch 'origin/devel' into devel
* error message if the first temporary rename step fails
added ignore files
INFO: CPU/MEM: 4 Core / 1 GB Max Memory / 15 MB Used Memory
Merge remote-tracking branch 'origin/devel' into v4.1