test
Merge branch 'pre-0.8.1-dev' of github.com:vFense/vFense into pre-0.8.1-dev