Require etags, for find-tag-marker-ring (see #325)
Merge remote-tracking branch 'upstream/master'

Merge remote-tracking branch 'upstream/master' for find-tagmarker-ring (see #325)
merge upstream #325 for find-tag-marker-ring