ro injection on 20140907-005044
Merge commit '930eb21cdf2daa53799621e3b1ac95059759320a' into HEAD