fa injection on 20140731-005205
Merge commit '0b8916e1502969fd6d194183ef3dd4a7d4653a0c' into HEAD