Do not fail if an ObjStm ends with a number

This is the cause of the problem described in http://bugs.debian.org/687669
Merge branch 'patched' into osx-package
Update OS X package