Merge pull request #1952 from nabinhait/hotfix

Country mandatory in company master