Summary of changes: 99f1a26... Perl 5.20 rebuild (*) 573b2be... Upstream update. (*) 4b61271... Merge cleanup. (*) This commit already existed in another branch; no separate mail sent