Summary of changes: 28e5f83... Perl 5.16 rebuild (*) 5aacb84... Upstream update. (*) 9c1397a... Merge cleanup. (*) This commit already existed in another branch; no separate mail sent