Merge remote-tracking branch 'upstream/pull/2296'

diff --combined INSTALL.md
index 1c40470699b07aeb7ee6a6602714eb9aaa5aad3c,d2d2b79b40b6a57b5fce6bf6c8a00056a5468ad8..097d4500eef403b2b0c98734ea602d823995cb77
--- 1/INSTALL.md
--- 2/INSTALL.md
+++ b/INSTALL.md
@@@ -123,6 -123,15 +123,15 @@@ We use [Yarn](https://yarnpkg.com/) to 
  ```
  bundle exec rake yarn:install
  ```
+ 
+ ## Storage setup
+ 
+ The Rails port needs to be configured with an object storage facility - for
+ development and testing purposes you can use the example configuration:
+ 
+ ```
+ cp config/example.storage.yml config/storage.yml
+ ```
  
  ## Database setup
  
@@@ -209,7 -218,7 +218,7 @@@ Rails comes with a built-in webserver, 
  bundle exec rails server
  ```
  
 -You can now view the site in your favourite web-browser at `http://localhost:3000/`
 +You can now view the site in your favourite web-browser at [http://localhost:3000/](http://localhost:3000/)
  
  Note that the OSM map tiles you see aren't created from your local database - they are just the standard map tiles.