Merge remote-tracking branch 'remotes/origin/pre-0.64' into TGit

Signed-off-by: Sven Strickroth <email@cs-ware.de>