TypeContext
Merge branch 'TypeContext'
Merge branch 'master' of https://github.com/signumsoftware/framework