Merge branch 'universal-ctags-fixes'