make more generic and compatible with bike sharing
Authored by: thibautd 2014-08-18
Parent: [r29843]
Child: [r29845]