Merge pull request #3859 from techee/ctags_sync2