Merge branch 'master' into autotools-conversion