Fixed the problem when there are two different time dimensions in the dataset. The index to times matching is either by datachoice (if dc subset panel is set to use selected) or by datasource.
Merge remote-tracking branch 'origin/master'