Pulling your EMML changes in

Pulling your EMML changes in