Merge branch 'dev_publisso_thunen' of github.com:fairagro/m4.2_basic_middleware into dev_publisso_thunen

Author: Zalfsten