Merge changes from upstream/development and fill in test for scribing question. References Coursemology/coursemology.org#277.
Merge changes from upstream/development and fill in test for scribing question. References Coursemology/coursemology.org#277.