update safrant:master with latest lexevs:master changes Dec 1 2014