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
Hashes on right hand side of library elements to avoid double-linkage.

(cherry picked from commit fb4bbb0e0d1381755a61634e5f781a355fe3a9b3)
Autocommit: libraries changed 2014-06-16-16:44:38