Build: #107 failed Changes by Dirk Petry <dpetry@eso.org> and Ville Suoranta

Code commits

casa6