fa injection on 20140731-005205
Merge commit 'b2268e9d0345e3e8381d25c5ac7cc135f644dd6d' into HEAD