Merged in commit 27410427fe779d1ff0d8f3ca4301c28074b6ac6d d7b6667 Simon Strandgaard commited on Feb 12