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