Accept new case-insensitive
Merge branch '0.9-stable'