type dojo
Merge branch 'master' into dojo1
breaking shit for dojo