Merge pull request #2279 from octo/ff/virt