fr injection on 20140927-005013
Merge commit '4b8f02cf2b6de5d1274aa46ce164e854a1342d12' into HEAD