resolve merge conflicts of 59febde9 to deqp-dev