Yes, Vigor is back!
Merge remote-tracking branch 'origin/kitkat' into blood