ro injection on 20140907-005044
Merge commit '39ec39b8a338516db6da7312fb1728ebeb385f79' into HEAD