Fixed RSS format

then should be merged back to 2.1, 2.2 and master