stable-20130422
7b1a0ed0 · Merge remote-tracking branch 'stable/master' into snapshot ·