Merge remote-tracking branch 'remotes/borntraeger/tags/kvm-s390-20140131' into staging