Make software PID configurable via USE_SOFTWARE_PID define
Merge remote-tracking branch 'upstream/master'