Merge branch 'master' into rtoy-gcl-pprint-help