master: 81fac80d73a4831097a927f2c5d1270c31480551 Sorting out some references to RSS and subscription