[master] Finished merge of trac3841 (use remove() vs unlink()) at the exception of the ChangeLog entry