3.0-fixes
Merge pull request #1632 from dereuromark/3.0-fixes

3.0-fixes