Patched SOLR-2242 in to 4.1