Merge branch 'develop' into feature-2898/suppress-birthday-flag

Author: mkimberlin

docs/Gemfile.lock

@@ -277,7 +277,7 @@ GEM
       unf_ext
     unf_ext (0.0.9.1)
     unicode-display_width (1.8.0)
-    uri (0.13.0)
+    uri (0.13.2)
     webrick (1.8.2)
 
 PLATFORMS