ref #209
Merge branch 'release' into solr