Couple of fixes for the updater
Merge branch 'develop'
Merge branch 'develop'
omgwtfnzbs fix
Merge branch 'bug-fixes' into develop