/TG/ Merge 28/01/2014

This is a PR so I can make sure that "Files changed" is correct