Merging remote branches

Merging quickfixes to master