fix
fix broken sql
fix sql
autoload
minor enh
Merge branch '1.x-stable' into develop