Merge "master" into "output".