pull upstream fixes for issues #19 and #22
Source for buildrump.sh git rev af11618c4405cdbff6a7de2fa00498e7d304599f
use latest virtif (once is enough)
Source for buildrump.sh git rev b40848a362b1392ee8d4e64a7e7a2d92d81784f1