Update Makefile.{am,in}
Merge branch 'topic/case-folding.rb'