resetting head of develop to last commit
Merge branch 'develop' of https://github.com/brucehoff/Synapse-Repository-Services into develop
Revert "pulled from upstream"

This reverts commit 0b6aa0e455d69bcd7c259af4b1130555b576ee12, reversing
changes made to f8d9a83d55793e21b3186e5d8f16e05ceb6abaf1.