Merge branch '3.16/uvd-r600' into 3.16/my