fr injection on 20140826-005012
Merge commit '533a910bf745eb0303c2de1a9b1dfb03e308b978' into HEAD