Fix for Error 500 when renaming
Merge remote-tracking branch 'upstream/Pistachitos' into Pistachitos