Merge branch 'develop' into 'master'

put vrouter definition back

See merge request !5