Clarifi

Merged Runar's cross-compilation update from master to clarifi.