Merge branch 'stable-3.0.5' into 'stable-3.0.5'

Fix Update errors

I closed my last merge-request, as the request included all the upstream commits. I recreated my fork to get a clean environment.

Changes i've done are listed in commit f9d95c0c