Merge branch 'release-4-6', adds the nbnxn functionality