Fixed Swift update bugs
Merge remote-tracking branch 'origin/master'