Merge branch 'docs/storing-remote-media' into 'develop'