ro injection on 20140905-005050
Merge commit '0c7b12f564534d07a470d6ae0ad666395411ebf8' into HEAD