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