Merging dev-3.0.0 changes into dev-3.1.0#750

adamdossa merged 2 commits intodev-3.1.0PolymathNetwork/polymath-core:dev-3.1.0from

dev-3.0.0PolymathNetwork/polymath-core:dev-3.0.0Copy head branch name to clipboard