Merge branches 'release' and 'buildfix' into release