ro injection on 20140907-005044
Merge commit '268b2192fcbbdb2bd3779725fef91acd3847963e' into HEAD