Merge tag '4.0.0' into develop

4.0.0 4.0.0

* tag '4.0.0':
  bumping version to 4.0.0
bumping version to 4.1.0
Merge branch 'release/4.1.0'

* release/4.1.0:
  bumping version to 4.1.0