merge latest changes for deployment

Merged Franz Geffke requested to merge contributions into master

In the future, changes pushed to master will deploy automatically. This is still in Beta.

Merge request reports