Summary of changes: 423c98c... Perl 5.20 rebuild (*) c522f1a... Upstream update. (*) ec63cf2... Merge cleanup. (*) This commit already existed in another branch; no separate mail sent