Change per https://www.drupal.org/node/2373707#comment-9336385
Merge branch '5x-QUESTION_CATEGORIZED_RANDOM' into 5x-comment-quiz_update_max_score_properties

* 5x-QUESTION_CATEGORIZED_RANDOM:
  Change per https://www.drupal.org/node/2373707#comment-9336385