fr injection on 20140429-004845
Merge commit '01b62b3d3bf92f83a48bdeb52ddb637ca31cae00' into HEAD