Crash-on-rename fix attempt.
Merge branch 'develop' of github.com:Invenietis/yodii into develop