Summary of changes: a57d1f7... backport some patches from master branch (*) d383138... fix multilib issue (*) (*) This commit already existed in another branch; no separate mail sent