fr injection on 20140927-005013
Merge commit '5fba3d3df5514a40cdd0d537b9dd07ebd491740d' into HEAD