Merge from ruudk

Merge all changes from ruudk:master into seggen-ibuildings:master