Merge branch 'master' into add/cli-orchestration

includes/class-lock.php

@@ -15,7 +15,7 @@ class Lock {
 	public static function check_lock( $lock, $limit = null, $timeout = null ) {
 		// Timeout, should a process die before its lock is freed
 		if ( ! is_numeric( $timeout ) ) {
-			$timeout = LOCK_DEFULT_TIMEOUT_IN_MINUTES * \MINUTE_IN_SECONDS;
+			$timeout = LOCK_DEFAULT_TIMEOUT_IN_MINUTES * \MINUTE_IN_SECONDS;
 		}
 
 		// Check for, and recover from, deadlock

includes/constants.php

@@ -32,4 +32,4 @@ const JOB_LOCK_EXPIRY_IN_MINUTES  = 30;
  * Locks
  */
 const LOCK_DEFAULT_LIMIT             = 10;
-const LOCK_DEFULT_TIMEOUT_IN_MINUTES = 10;
+const LOCK_DEFAULT_TIMEOUT_IN_MINUTES = 10;