sync with upstream; add cuda-5.5