fa injection on 20140730-140952
Merge commit '761b9d599a7d921f35d10993004380294cc3b215' into HEAD