Upgrade JSdraw input.
Merge pull request #3135 from edx/hotfix/fix-jsdraw-input-2

Upgrade JSdraw input.
Merge remote-tracking branch 'origin/release'

Conflicts:
	requirements/edx/edx-private.txt
Merge pull request #3143 from edx/adam/merge-release-to-master

Adam/merge release to master