diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index 38a0ea599a..392d29134b 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -782,7 +782,7 @@ class CapaModule(CapaFields, XModule):
                 return {'success': msg}
             raise
 
-        self.attempts += 1
+        self.attempts = self.attempts + 1
         self.lcp.done = True
 
         self.set_state_from_lcp()
diff --git a/common/lib/xmodule/xmodule/tests/test_fields.py b/common/lib/xmodule/xmodule/tests/test_fields.py
index a5730d55b3..d944566e97 100644
--- a/common/lib/xmodule/xmodule/tests/test_fields.py
+++ b/common/lib/xmodule/xmodule/tests/test_fields.py
@@ -2,7 +2,7 @@
 import datetime
 import unittest
 from django.utils.timezone import UTC
-from xmodule.fields import Date
+from xmodule.fields import Date, Timedelta
 import time
 
 class DateTest(unittest.TestCase):
@@ -93,3 +93,40 @@ class DateTest(unittest.TestCase):
             '2012-12-31T23:59:59Z',
             DateTest.date.deserialize('"2012-12-31T23:59:59Z"'),
         )
+
+
+class TimedeltaTest(unittest.TestCase):
+    delta = Timedelta()
+
+    def test_from_json(self):
+        self.assertEqual(
+            TimedeltaTest.delta.from_json('1 day 12 hours 59 minutes 59 seconds'),
+            datetime.timedelta(days=1, hours=12, minutes=59, seconds=59)
+        )
+
+        self.assertEqual(
+            TimedeltaTest.delta.from_json('1 day 46799 seconds'),
+            datetime.timedelta(days=1, seconds=46799)
+        )
+
+    def test_to_json(self):
+        self.assertEqual(
+            '1 days 46799 seconds',
+            TimedeltaTest.delta.to_json(datetime.timedelta(days=1, hours=12, minutes=59, seconds=59))
+        )
+
+    def test_serialize(self):
+        self.assertEqual(
+            TimedeltaTest.delta.serialize('1 day 12 hours 59 minutes 59 seconds'),
+            '"1 day 12 hours 59 minutes 59 seconds"'
+        )
+
+    def test_deserialize(self):
+        self.assertEqual(
+            '1 day 12 hours 59 minutes 59 seconds',
+            TimedeltaTest.delta.deserialize('1 day 12 hours 59 minutes 59 seconds')
+        )
+        self.assertEqual(
+            '1 day 12 hours 59 minutes 59 seconds',
+            TimedeltaTest.delta.deserialize('"1 day 12 hours 59 minutes 59 seconds"')
+        )
diff --git a/common/test/data/full/course.xml b/common/test/data/full/course.xml
index b2f9097020..9ee128da1a 100644
--- a/common/test/data/full/course.xml
+++ b/common/test/data/full/course.xml
@@ -1 +1 @@
-<course filename="6.002_Spring_2012" slug="6.002_Spring_2012" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="never" name="6.002 Spring 2012" start="2015-07-17T12:00" course="full" org="edX" show_timezone="true"/>
+<course filename="6.002_Spring_2012" slug="6.002_Spring_2012" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="never" name="6.002 Spring 2012" start="2015-07-17T12:00" course="full" org="edX" show_timezone="true" advanced_modules="[&quot;videoalpha&quot;]"/>
diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
index fb20fd2b22..668ac4804c 100644
--- a/requirements/edx/github.txt
+++ b/requirements/edx/github.txt
@@ -8,6 +8,6 @@
 -e git://github.com/eventbrite/zendesk.git@d53fe0e81b623f084e91776bcf6369f8b7b63879#egg=zendesk
 
 # Our libraries:
--e git+https://github.com/edx/XBlock.git@a56a79d8#egg=XBlock
+-e git+https://github.com/edx/XBlock.git@eaaf4831#egg=XBlock
 -e git+https://github.com/edx/codejail.git@5fb5fa0#egg=codejail
 -e git+https://github.com/edx/diff-cover.git@v0.1.0#egg=diff_cover