Merge branch 'refs/heads/master' into stable
fixed typo
Merge branch 'refs/heads/stable'