Merge "moved Exception classes from ContentHandler.php"