stable-20150511
a8b27188 · Merge remote-tracking branch 'stable/master' into snapshot ·