Merge branch 'upstream-16.11-stable' into 16.11.x