fa injection on 20140731-005205
Merge commit '3a2d4a53dfede429f6c26d0a8da70dbbffce995e' into HEAD