Merge branch 'signoffs' into kcmaster