Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160711' into staging