Merge of14 branch into master

Reviewer: trivial