Cleans up properties referring to a data source when the DataSource object is destroyed, fixes #137
Merge branch 'hotfix/issue-137' into stable