Fixed issue with git update being stuck at a certain stage
Merge branch 'fixes' into dev