fr injection on 20140508-004927
sq injection on 20140508-004927
Merge commit '25383130ba34542601a9d8981d7f9fb89c556ad3' into HEAD