Update master
Compare changes
Created by: acrovato
This PR consists in bringing the latest development into master. They consist of the following:
Kim features (mrstlnos) have not been built and are more than likely completely broken...