Master See merge request !3
Master See merge request !2
# Conflicts: # index.php
dos See merge request !1