Merge remote-tracking branch 'trunk/master'

Pull in some old commits for 64bit build which never got pulled to
trunk-ring3. No actual code change, as these commits have already been
cherry-picked to trunk-ring3.

Author: johnelse