Tg merge 03 02 2014

Pls work.