Merged master into develop to sync them

There were conflict related to line-endings or hot fixes were a file that was newer in develop was touched in master and develop later. 

These conflicts can only occur if someone edits both files independently. Instead we have to merge a master-hotfix into develop, resolve conflicts and then commit it into develop (via PR) to keep everything in sync.