re-do all the fixes (git screwed up branches, i don't know, this is a clean one now)

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
Merge remote-tracking branch 'origin/0.9.31.2' and fix install-SQL file