Commit 6246de93b65fc74cba2e17ab031402adff84433f

Sun He 2014-03-06T11:16:36

Merge completed: resolve the conflict with the upstream