Updated scaldi version
Merge remote-tracking branch 'origin/master'
Updated scaldi version