Merge tag 'upstream/0.9.4+r4178.20120131'