Summary of changes: 325181f... Perl 5.20 rebuild (*) faf6774... Upstream update. (*) b627427... Merge cleanup. (*) This commit already existed in another branch; no separate mail sent