Merge remote-tracking branch 'origin' into develop
Merge branch 'develop' of https://github.com/spapas/verdant-rca into develop
Fix for manual + automatic staff feed (#549)