Fixed minor issue with Angular not listing data sources
Merge branch 'origin/develop'