Summary of changes: 268d823... Perl 5.20 rebuild (*) 5bc986d... Upstream update. (*) 4ff0f49... Merge cleanup. (*) This commit already existed in another branch; no separate mail sent