Add config.h stamp-h1
Merge branch 'master' into devel