SDPII-32
Merge branch 'master' into solr_bug_fix
SDPII-32
SDPII-32
Merging Master