Merge remote-tracking branch 'upstream/master'
Fix merge issues with VPS.
Updates.
Merge remote-tracking branch 'origin/master'