fr injection on 20140430-004846
sq injection on 20140430-004846
Merge commit '5a3e7961e877c59d06503f156f2d5bc1fcba5dd0' into HEAD