Merge PR#393 from 'c/keyword-types'