refs #200
Merge branch 'release' into solr