Merge branch 'netbsd-script' into 'develop'