Fix for virtual unit binding
Merge branch 'new-guides-clean-merge' of https://github.com/PonteIneptique/docview
into merge_guides2