Merge branch 'master' into gsocdrm_merger
Give /usr/local/... precedence over /usr/pkg/... in various paths.
Merge branch 'master' into gsocdrm_alter
Merge branch 'gsocdrm_alter' into gsocdrm_github