Minor changes in comment in spi.*
Merge remote-tracking branch 'origin/spi_final' into integration