Merge master into laptop-1366w-external.