Issue #2156793 by Wim Leers, jessebeach: Unravel a PHP 5.4 workaround for Edit module once Drupal requires PHP 5.4.
Issue #2210177 by andypost: Use getSetting() in comment formatter.