Merge tag '2.0.pre1' into develop

Requests every half hour

* tag '2.0.pre1':
edit host
Merge branch 'release/2.0'

* release/2.0:
  edit host