Merge pull request #5925

from stvstnfrd:pep8/continuation
into edx:master