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