Merge branch 'master' into stable
Merge branch 'stable' of http://github.com/ungdev/site-etu into stable
Merge branch 'stable'