Merge pull request #1034 from Cyan4973/make6

minor multiconf update