Summary of changes: b80117e... Perl 5.20 rebuild (*) 3b00777... Upstream update. (*) 49673fa... Merge cleanup. (*) This commit already existed in another branch; no separate mail sent