Merge tag 'tags/s390x-2018-05-02' into staging