fr injection on 20140922-054456
Merge commit '24d889845fc6c771f0472d2fa501e127ae4b1b7f' into HEAD