Merge remote-tracking branch 'origin' into release
Merge remote-tracking branch 'origin' into release
Merge remote-tracking branch 'origin' into release
Merge remote-tracking branch 'origin' into release
Merge remote-tracking branch 'origin' into release
Merge remote-tracking branch 'origin' into release
Merge remote-tracking branch 'origin' into release
Updated makefile to point to tag 7.x-1.0-beta5
Merge remote-tracking branch 'origin' into release
Merge branch 'development' into release
Merge remote-tracking branch 'origin' into release
Merge pull request #3 from ding2tal/core-pr-4

Core pr 4
Merge branch 'master' into development