Hugues Andreux: better support for different installation locations