Merge master into of14 branch

Reviewer: trivial

Pulls in the recent LOCI cleanups.