Merge branch 'master' into rfontanarosa/1668/submission-details-display-other-text-along-with-other-option

Author: rfontanarosa

docs/Gemfile.lock

@@ -250,7 +250,7 @@ GEM
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.3.2)
+    rexml (3.3.3)
       strscan
     rouge (3.26.0)
     ruby2_keywords (0.0.5)