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