tr injection on 20130922-050938
Merge commit 'c626703914098d0a7b36c4828d57bdfdb2068fa8' into HEAD