Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20170123' into staging