Dont fool around with changes
Merge remote-tracking branch 'origin/master' into hospimed