Prefix URIs with / to fix test failures
Merge branch 'master' into rails4.2
Merge branch 'rails4.2'