Creating a 'models.workspace' package and putting some classes in there
Merging 'master' into 'topic'