Merge branch 'master' into storage-module
Merge pull request #9 from Juniper/storage-module

Merge branch 'master' into storage-module