fix a scala 2.10 regression issue
Merge branch 'additional_oids' into thefactory