Merge branch '3.1.0'

Conflicts:
signin/signin.php