Merge branch 'hotfix/1.0.6'
Allow datapoints to be referenced by dp id or by ds id + dp id
Merge branch 'master' into develop

Incorporating changes made to master by keruzu.