Merge branch 'quotes-on-ETags' (closes #588)