Merge commit 'origin/master' into i965g-restart