Merge remote-tracking branch 'origin/Gunnar-Patronen'
Merge remote-tracking branch 'origin/master' into Jaimy-AudioSensing