SOLR-4321

My apologies if this is not being done properly. Proposed patch for SOLR-4321