Fixed #784
Merge branch 'master' of ssh://github.com/CERN/apvs