tr injection on 20130922-050938
fr injection on 20130922-050938
Merge commit 'aedbf35109fdf78dea65dd710dc87bca55576ef1' into HEAD