fr injection on 20140412-004838
Merge commit 'f2cded33e5ee324aa2814286e29e7bfc22a6f24f' into HEAD