Merge master into of14 branch

Reviewer: trivial

Also includes a fix to the input files to get it to unify.