3.0 RC1 changes
Merge branch 'master' of https://github.com/MinLL/SDPlus