Set autoconf version to 2.61

This should be more portable
Merge remote-tracking branch 'origin/develop' into develop