Update master from develop for release #12

Closed mwbouwkamp-mendix closed 6 months ago