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