Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: I42a123dd4afcd755487956dd2ff64e8d7e548b60