merge from 'apache/lucene-solr' trunk 20140628