Merge branch 'hotfix/0.16.0.2'
Restore other-country-notice

It got lost in a previous merge.
Merge branch 'hotfix/0.16.0.3' into rails-3-develop