Merge branch 'release/2.0.1' into develop

* release/2.0.1:
  Fix widget conflicts and remove adbrite