Update from hama-trunk-gpu