fr injection on 20140916-005033
Merge commit '44bdfb5298bd684288bc387a67385159f6125639' into HEAD