ro injection on 20141003-005036
Merge commit '2f40ee51fd11192e15ad2722e596614f17aa70c8' into HEAD