Pushed up links to personal repo by mistake
Merge remote-tracking branch 'upstream/master'

* upstream/master: