Merge remote-tracking branch 'waldi-salsa/godard-apache' into HEAD