Merging in glosser from 2012