Add missing specifiers for %h?
cvsimport
Merge remote-tracking branch 'upstream/master'