lola_1
Merge branch 'stable'