Merge branch 'develop' of /software/vertres/git/origin/vr-pipe into develop