Merging remote branches

Merging quickfixes to master
This is not readable