Rename ruby dependency JSON->json
Merge remote-tracking branch 'origin/master'