Generate 3.6 documentation from this branch
Update of JSON files from masterfiles in 3.6 branch.
Merge remote-tracking branch 'upstream/master' into 3.6
Autocommit: libraries changed 2014-06-16-14:05:18