ro injection on 20140913-005025
Merge commit '150c4b0c3221597f155ebe54ed9f0092a9eaabf5' into HEAD