Merge branch 'develop' of github.com:apache/vcl into develop