Merge "Clean up handling of 'infinity'"

diff --cc includes/Block.php
Simple merge

diff --cc includes/Title.php
Simple merge

diff --cc includes/api/ApiQueryLogEvents.php
Simple merge

diff --cc includes/db/Database.php
Simple merge

diff --cc includes/page/WikiPage.php
Simple merge

diff --cc languages/Language.php
Simple merge