Merge branch 'master', remote-tracking branch 'origin'
Adds article: git annoyed me.