spec fix for ruby 1.9.3
Merge branch 'class_redesign' into repo_optional