Merge from geomajas master