svn commit: r321215 - stable/11

[Ngie Cooper]

Author: ngie
Date: Wed Jul 19 16:54:22 2017
New Revision: 321215
URL: https://svnweb.freebsd.org/changeset/base/321215

Log:
  Record merges for r319659 and r319660.

Modified:
Directory Properties:
  stable/11/   (props changed)