Summary of changes: 9c21ed2... Perl 5.20 rebuild (*) 04d8d73... Upstream update. (*) 87d397b... Merge cleanup. (*) This commit already existed in another branch; no separate mail sent