Merge remote-tracking branch 'origin/changeStimulusBehavior' into changeStimulusBehavior

8 jobs for changeStimulusBehavior in 131 minutes and 28 seconds (queued for 1 second)