Merge branch 'allspi'