Align master with upstream/master

Revert "Append to routes instead of prepend"

This reverts commit 56d040cea13a14258ce379b3aee255003a5a895e.
Align master with upstream/master

Revert "Revert "Allow spree 1.3.x""

This reverts commit 9ef3251c8cad800500a816137049870042744b2a.