ro injection on 20140907-005044
Merge commit '7c1dcf205c38f2ae8a11cb7ebb623c4efcb19a66' into HEAD