inline twig address formatter, configuration for country formatters
Merge remote-tracking branch 'origin/master'