Merge branch 'master' into net-next

Needed to add JSON support to tclass.