Merge branch 'master' into giles-remove-light-client

19 jobs for 4105 in 39 minutes and 37 seconds (queued for 4 seconds)