Merge branch 'master', remote-tracking branch 'origin'
Generate tags locally each time buffer is saved.