ro injection on 20141003-005036
Merge commit '5afae3fe3f3c44bee685b9ae468fedeea8cd5ded' into HEAD