Merge NetBSD -current.
Merge branch 'netbsd-current'
Merge NetBSD -current.
Merge branch 'netbsd-current'
Appease GCC 4.8.
Merge branch 'master' into diagnostic