Summary of changes: 95f96ef... sync with f16 (*) 13e99d1... try to make it build (*) dfd494a... Update to 0.12.7. (*) b549356... Fix merge conflicts. (*) This commit already existed in another branch; no separate mail sent