Merge pull request #1 from emmairwin/7.x-dev

CORE: initial commit