fr injection on 20140917-004955
Merge commit '5f9d5018cb1ae6a9c61a385ca48320fc14140e1f' into HEAD