Summary of changes: 27c3d43... Perl 5.20 rebuild (*) 2df002b... Upstream update. (*) 4bbd966... Merge cleanup. (*) This commit already existed in another branch; no separate mail sent