stable-20120813
3bbeaf7d · Merge remote branch 'stable/master' into snapshot ·