Update mesh branch with recent master changes.