Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20150609' into staging