Merge branch 'type-var-extends-0' into 'master'

Type variables extending other variables should include the separator

See merge request !89