fr injection on 20140617-005111
Merge commit 'e4e96f85461323a613db189e4fefe2b0ab7752ba' into HEAD