Merge patch-1 to master.