Sync with v0.99.2 from Bioc

And a tentative fix for issue #6.