Merge branch 'master' into gav-optional-storage

This commit is contained in:
Gav
2018-02-15 17:55:01 +01:00
42 changed files with 1611 additions and 1540 deletions