Adding JSON attribute options.
Adding 2.x settings that had been missed.
Updating HISTORY.
1.5.9
Merge branch 'release/v1.5.9'
Merge remote-tracking branch 'origin/master'