Merged revision(s) 1555608 from lucene/dev/trunk: One more try: closes #1, closes #2, closes #3, closes #6, closes #10 on github