Ignore project settings.
cleanup
Merge remote-tracking branch 'origin/master' into rpi_nxt