Merge branch 'master' of https://github.com/qmk/qmk_firmware

keyboards/ergodox/config.h

@@ -3,7 +3,7 @@
 
 #define MOUSEKEY_INTERVAL       20
 #define MOUSEKEY_DELAY          0
-#define MOUSEKEY_TIME_TO_MAX    40
+#define MOUSEKEY_TIME_TO_MAX    60
 #define MOUSEKEY_MAX_SPEED      7
 #define MOUSEKEY_WHEEL_DELAY 0
 

keyboards/ergodox/ez/config.h

@@ -60,6 +60,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE    15
 
+#define PREVENT_STUCK_MODIFIERS
+
 #define USB_MAX_POWER_CONSUMPTION 500
 
 /*