Merge branch 'bug/country-error' into release/2014-08-28
Merge branch 'release/2014-08-28' into dev
Revert to cc9fc24bc114beb40085f6722c5c7656c599312b