Merge branch 'master' of https://github.com/Containing/Containing-Core.git