autogen.sh is now bootstrap!
Merge branch 'master' into flock-option