Merge branch 'master' into feature/docs
Move datamapper license to docs
Merge branch 'feature/docs'