fr injection on 20130830-060126
Merge commit '33c904c3f0c4e811f2b5b8f2cf55f4f4bc2a3e78' into HEAD