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