merge master to testing

mostly so the post-receive bug gets fixed.