Merge branch 'development'
Merge branch 'development'
Fixed json reference. will not be an issue for existing packages.
Merge branch 'master' into development