Some changes in info.php
Merge branch 'origin/master'
Merge branch 'upstream/master'
Merge branch 'master'