Merge ^/head r305361 through r305389.
authordim <dim@FreeBSD.org>
Sun, 4 Sep 2016 17:26:42 +0000 (17:26 +0000)
committerdim <dim@FreeBSD.org>
Sun, 4 Sep 2016 17:26:42 +0000 (17:26 +0000)
commit37d98b574d070e1562a140b1e2ae465bbd5b6946
treea28212c637a0de1b460cfe2379d188502dd0daf2
parent774f339bee0f651e27c4d89a5be141fc8e58bc74
parente0d1234535b277317a1a34f9a5cf3ea949892103
Merge ^/head r305361 through r305389.