diff --git a/wp-admin/includes/class-wp-filesystem-ssh2.php b/wp-admin/includes/class-wp-filesystem-ssh2.php
index 294440dec9..0de635481a 100644
--- a/wp-admin/includes/class-wp-filesystem-ssh2.php
+++ b/wp-admin/includes/class-wp-filesystem-ssh2.php
@@ -184,8 +184,9 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 
 	public function cwd() {
 		$cwd = $this->run_command('pwd');
-		if ( $cwd )
-			$cwd = trailingslashit($cwd);
+		if ( $cwd ) {
+			$cwd = trailingslashit( trim( $cwd ) );
+		}
 		return $cwd;
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3d88ee83c1..485a16ddf2 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31685';
+$wp_version = '4.2-alpha-31686';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.