ro injection on 20140907-005044
Merge commit '4ba4aa8cb9bfa07c9017833fc2c3ab06ac9c67dc' into HEAD