Forced commit to mark the real 10.1-BETA3 point, after
r272152.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation
Merge remote-tracking branch 'freebsd/stable/10' into hardened/10/aslr