Merge tag 'upstream/0.9.4+r4182.20130608'