Merge branch 'release/0.2.1' into develop
Fixed a "deprecated" warning.
Merge branch 'hotfix/redirecturl' into develop
Merge branch 'develop'

* develop:
  Fixed a "deprecated" warning.