Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2019-07-02' into staging