Merge pull request #626 from kanoi/master

minion changes for SPI problems