Merge "includes/ContentHandler.php does not exist, it's includes/content/ContentHandl...