Added stop points to /shapes requests.
Merge branch 'master' into add-stops-to-shapes