Merge git://github.com/Jopie64/tortoisegit master