fa injection on 20140730-140952
Merge commit '81fba7f6411517f9b0bbe5171acddb07b0f97cd9' into HEAD