Merge "Building fixes" of Mathadon into "issue34_BESTEST"