Merge remote-tracking branch 'origin/master'

# Conflicts:
#	quantum/audio/voices.c

diff --cc quantum/audio/voices.c
index 8b3978f3d805e83d1364256d1f8b5e9beb3ea0d9,330ffb803ae737eb34daef71fcb93b58528c64bb..886101187156c75fd53c70f08f100ec0ac84a702
--- 1/quantum/audio/voices.c
--- 2/quantum/audio/voices.c
+++ b/quantum/audio/voices.c
@@@ -84,22 -94,10 +94,25 @@@ float voice_envelope(float frequency) 
          case duty_octave_down:
              polyphony_rate = 0;
              note_timbre = (envelope_index % 2) * .125 + .375 * 2;
 -              break;
 +            if ((envelope_index % 4) == 0)
 +                note_timbre = 0.5;
 +            if ((envelope_index % 8) == 0)
 +                note_timbre = 0;
-         break;
++            break;
 +        case duty_fifth_down:
 +            note_timbre = 0.5;
 +            if ((envelope_index % 5) == 0)
 +                note_timbre = 0.75;
-         break;
++            break;
 +        case duty_fourth_down:
 +            if ((envelope_index % 12) == 0)
 +                note_timbre = 0.25;
 +            else
 +                note_timbre = 0.5;
-         break;
++            break;
+ 
+               default:
+                       break;
      }
  
      return frequency;

diff --cc quantum/audio/voices.h
Simple merge