Merge remote-tracking branch 'FiloSottille/vbr'