Fix for Mock 7 config
Merge branch 'stable'