Fix to #32
Merge branch 'upstream/0.25'