Merge branch 'andyd' into blead