Various fixes to the subtype function
Merge branch 'master' of https://github.com/cwi-swat/rascal.git
Small fixes to the cobra framework
Merge branch 'master' of https://github.com/cwi-swat/rascal.git