Symbolize name only if it responds to to_sym
Merge branch '2-7-stable'