ignoring the contexts folder
Merge branch 'stable'