Get updated from original repo, version 3.4

Pull all the nice stuff patched in the original repository