svn commit: r321216 - stable/10

[Ngie Cooper]

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

Log:
  Record merges for r319659 and r319660.

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