diff --git a/cms/djangoapps/contentstore/tests/test_clone_course.py b/cms/djangoapps/contentstore/tests/test_clone_course.py
index b95b01c..a0c9428 100644
--- a/cms/djangoapps/contentstore/tests/test_clone_course.py
+++ b/cms/djangoapps/contentstore/tests/test_clone_course.py
@@ -2,6 +2,8 @@
 Unit tests for cloning a course between the same and different module stores.
 """
 import json
+from django.conf import settings
+
 from opaque_keys.edx.locator import CourseLocator
 from xmodule.modulestore import ModuleStoreEnum, EdxJSONEncoder
 from contentstore.tests.utils import CourseTestCase
@@ -10,6 +12,12 @@ from student.auth import has_course_author_access
 from course_action_state.models import CourseRerunState
 from course_action_state.managers import CourseRerunUIStateManager
 from mock import patch, Mock
+from xmodule.contentstore.content import StaticContent
+from xmodule.contentstore.django import contentstore
+from xmodule.modulestore.tests.factories import CourseFactory
+
+
+TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT
 
 
 class CloneCourseTest(CourseTestCase):
@@ -46,6 +54,54 @@ class CloneCourseTest(CourseTestCase):
             self.store.clone_course(split_course3_id, split_course4_id, self.user.id)
             self.assertCoursesEqual(split_course3_id, split_course4_id)
 
+    def test_space_in_asset_name_for_rerun_course(self):
+        """
+        Tests check the scenario where one course which has an asset with percentage(%) in its
+        name, it should re-run successfully.
+        """
+        org = 'edX'
+        course_number = 'CS101'
+        course_run = '2015_Q1'
+        display_name = 'rerun'
+        fields = {'display_name': display_name}
+        course_assets = set([u'subs_Introduction%20To%20New.srt.sjson'], )
+
+        # Create a course using split modulestore
+        course = CourseFactory.create(
+            org=org,
+            number=course_number,
+            run=course_run,
+            display_name=display_name,
+            default_store=ModuleStoreEnum.Type.split
+        )
+
+        # add an asset
+        asset_key = course.id.make_asset_key('asset', 'subs_Introduction%20To%20New.srt.sjson')
+        content = StaticContent(
+            asset_key, 'Dummy assert', 'application/json', 'dummy data',
+        )
+        contentstore().save(content)
+
+        # Get & verify all assets of the course
+        assets, count = contentstore().get_all_content_for_course(course.id)
+        self.assertEqual(count, 1)
+        self.assertEqual(set([asset['asset_key'].block_id for asset in assets]), course_assets)
+
+        # rerun from split into split
+        split_rerun_id = CourseLocator(org=org, course=course_number, run="2012_Q2")
+        CourseRerunState.objects.initiated(course.id, split_rerun_id, self.user, fields['display_name'])
+        result = rerun_course.delay(
+            unicode(course.id),
+            unicode(split_rerun_id),
+            self.user.id,
+            json.dumps(fields, cls=EdxJSONEncoder)
+        )
+
+        # Check if re-run was successful
+        self.assertEqual(result.get(), "succeeded")
+        rerun_state = CourseRerunState.objects.find_first(course_key=split_rerun_id)
+        self.assertEqual(rerun_state.state, CourseRerunUIStateManager.State.SUCCEEDED)
+
     def test_rerun_course(self):
         """
         Unit tests for :meth: `contentstore.tasks.rerun_course`
diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
index c61b66d..70ce6c6 100644
--- a/requirements/edx/github.txt
+++ b/requirements/edx/github.txt
@@ -38,7 +38,7 @@ git+https://github.com/hmarr/django-debug-toolbar-mongo.git@b0686a76f1ce3532088c
 -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock
 -e git+https://github.com/edx/edx-ora2.git@release-2015-05-08T16.15#egg=edx-ora2
 -e git+https://github.com/edx/edx-submissions.git@e2361932b9bce061a018a31bb3929e9cade80f49#egg=edx-submissions
--e git+https://github.com/edx/opaque-keys.git@1254ed4d615a428591850656f39f26509b86d30a#egg=opaque-keys
+-e git+https://github.com/edx/opaque-keys.git@df0dd602869e498e512659bb4bd243309e30e19a#egg=opaque-keys
 -e git+https://github.com/edx/ease.git@c6dee053eae6b3ac4fdf6be11fa7a9f8265540aa#egg=ease
 -e git+https://github.com/edx/i18n-tools.git@7b89d5e01c1a7cc5d69d813bd8c6b706a8f75119#egg=i18n-tools
 -e git+https://github.com/edx/edx-oauth2-provider.git@0.5.1#egg=oauth2-provider