fa injection on 20140730-140952
Merge commit '4fa35165bb7de3f4a614bd0ee5ec8880ee3b4b72' into HEAD