Merge branch '3.2' into 3.3

src/Search/Updaters/SearchUpdater.php

@@ -105,8 +105,8 @@ class SearchUpdater
                     'command' => $command,
                     'fields' => array()
                 );
-            // Otherwise update the class label if it's more specific than the currently recorded one
             } elseif (is_subclass_of($class, $writes[$key]['class'])) {
+                // Otherwise update the class label if it's more specific than the currently recorded one
                 $writes[$key]['class'] = $class;
             }
 

src/Solr/SolrIndex.php

@@ -2,6 +2,7 @@
 
 namespace SilverStripe\FullTextSearch\Solr;
 
+use Exception;
 use SilverStripe\Control\Director;
 use SilverStripe\Core\Environment;
 use SilverStripe\FullTextSearch\Search\Indexes\SearchIndex;