fr injection on 20140929-005139
ro injection on 20140929-005139
Merge commit 'de3e0f545491bf9a475ae82d8767ff51e6218f7c' into HEAD