Merge branch 'development' into release
Merge pull request #2 from ding2tal/core-pr-4

Core pr 4
Merge branch 'master' into development