stable-20130722
2536717b · Merge remote-tracking branch 'stable/master' into snapshot ·