Merge remote-tracking branch 'remotes/rth/tags/pull-s390-20170623' into staging