fa injection on 20140730-140952
Merge commit '7eff394cf11ad870d2678c819ed231e785455466' into HEAD