Update Dsci master

This should put dsci's master in sync with upstream