Merge change 2cc971c from r0.6. Fixes #51.