Changed dsinline so it doesn't return the ds type
Merge remote-tracking branch 'upstream/master'