Merge branch '0.7.0' of github.com:toppatch/vFense into 0.7.0
Merge branch '0.7.0' of github.com:toppatch/vFense into 0.7.0