Merge branch 'hastetrust'