reverted to 1.6
Merge branch 'issue_523_build_all_fails_mpih' into devel