Merged revision(s) 1429958 from lucene/dev/trunk:
SOLR-4265: Fix charset bug... :(

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1429959 13f79535-47bb-0310-9956-ffa450edef68