Merge remote-tracking branch 'upstream/pull/1652'

diff --combined Gemfile
index 8387097fe85801511939b37b2c4ade0cc8a5d10f,772e6f300afa97f5a77fca6e8465ef9f1457fd5e..79bc0d10e8a50efe611136ac1c6329cd00c90c30
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -1,7 -1,7 +1,7 @@@
  source "https://rubygems.org"
  
  # Require rails
- gem "rails", "5.0.6"
+ gem "rails", "5.1.4"
  
  # Require things which have moved to gems in ruby 1.9
  gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
@@@ -42,7 -42,7 +42,7 @@@ gem "image_optim_rails
  
  # Load rails plugins
  gem "actionpack-page_caching"
- gem "composite_primary_keys", "~> 9.0.7"
+ gem "composite_primary_keys", "~> 10.0.0"
  gem "dynamic_form"
  gem "http_accept_language", "~> 2.0.0"
  gem "i18n-js", ">= 3.0.0"
@@@ -104,7 -104,6 +104,7 @@@ gem "logstasher
  
  # Gems useful for development
  group :development do
 +  gem "annotate"
    gem "listen"
    gem "vendorer"
  end

diff --combined Gemfile.lock
index 046f8a462d54a5881620239251c063091ac87f15,e4b521c1ae70132c35ab80002340824946e4af34..653098e8e563571b4ceeab8a94bdc169cce4e685
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -2,59 -2,56 +2,59 @@@ GE
    remote: https://rubygems.org/
    specs:
      SystemTimer (1.2.3)
-     actioncable (5.0.6)
-       actionpack (= 5.0.6)
-       nio4r (>= 1.2, < 3.0)
+     actioncable (5.1.4)
+       actionpack (= 5.1.4)
+       nio4r (~> 2.0)
        websocket-driver (~> 0.6.1)
-     actionmailer (5.0.6)
-       actionpack (= 5.0.6)
-       actionview (= 5.0.6)
-       activejob (= 5.0.6)
+     actionmailer (5.1.4)
+       actionpack (= 5.1.4)
+       actionview (= 5.1.4)
+       activejob (= 5.1.4)
        mail (~> 2.5, >= 2.5.4)
        rails-dom-testing (~> 2.0)
-     actionpack (5.0.6)
-       actionview (= 5.0.6)
-       activesupport (= 5.0.6)
+     actionpack (5.1.4)
+       actionview (= 5.1.4)
+       activesupport (= 5.1.4)
        rack (~> 2.0)
-       rack-test (~> 0.6.3)
+       rack-test (>= 0.6.3)
        rails-dom-testing (~> 2.0)
        rails-html-sanitizer (~> 1.0, >= 1.0.2)
      actionpack-page_caching (1.1.0)
        actionpack (>= 4.0.0, < 6)
-     actionview (5.0.6)
-       activesupport (= 5.0.6)
+     actionview (5.1.4)
+       activesupport (= 5.1.4)
        builder (~> 3.1)
-       erubis (~> 2.7.0)
+       erubi (~> 1.4)
        rails-dom-testing (~> 2.0)
        rails-html-sanitizer (~> 1.0, >= 1.0.3)
-     activejob (5.0.6)
-       activesupport (= 5.0.6)
+     activejob (5.1.4)
+       activesupport (= 5.1.4)
        globalid (>= 0.3.6)
-     activemodel (5.0.6)
-       activesupport (= 5.0.6)
-     activerecord (5.0.6)
-       activemodel (= 5.0.6)
-       activesupport (= 5.0.6)
-       arel (~> 7.0)
-     activesupport (5.0.6)
+     activemodel (5.1.4)
+       activesupport (= 5.1.4)
+     activerecord (5.1.4)
+       activemodel (= 5.1.4)
+       activesupport (= 5.1.4)
+       arel (~> 8.0)
+     activesupport (5.1.4)
        concurrent-ruby (~> 1.0, >= 1.0.2)
        i18n (~> 0.7)
        minitest (~> 5.1)
        tzinfo (~> 1.1)
      addressable (2.5.2)
        public_suffix (>= 2.0.2, < 4.0)
-     arel (7.1.4)
 +    annotate (2.7.2)
 +      activerecord (>= 3.2, < 6.0)
 +      rake (>= 10.4, < 13.0)
+     arel (8.0.0)
      ast (2.3.0)
-     autoprefixer-rails (7.1.4.1)
+     autoprefixer-rails (7.1.5)
        execjs
      bigdecimal (1.1.0)
      builder (3.2.3)
      canonical-rails (0.2.1)
        rails (>= 4.1, < 5.2)
-     capybara (2.15.3)
+     capybara (2.15.4)
        addressable
        mini_mime (>= 0.1.3)
        nokogiri (>= 1.3.3)
@@@ -72,8 -69,8 +72,8 @@@
        coffee-script-source
        execjs
      coffee-script-source (1.12.2)
-     composite_primary_keys (9.0.7)
-       activerecord (~> 5.0.0)
+     composite_primary_keys (10.0.0)
+       activerecord (~> 5.1.0)
      concurrent-ruby (1.0.5)
      coveralls (0.8.21)
        json (>= 1.8, < 3)
@@@ -87,7 -84,7 +87,7 @@@
      dalli (2.7.6)
      docile (1.1.5)
      dynamic_form (1.1.4)
-     erubis (2.7.0)
+     erubi (1.6.1)
      execjs (2.7.0)
      exifr (1.3.2)
      factory_girl (4.8.1)
@@@ -102,7 -99,7 +102,7 @@@
      geoip (1.6.3)
      globalid (0.4.0)
        activesupport (>= 4.2.0)
-     hashdiff (0.3.6)
+     hashdiff (0.3.7)
      hashie (3.5.6)
      htmlentities (4.3.4)
      http_accept_language (2.0.5)
@@@ -225,7 -222,7 +225,7 @@@
        cliver (~> 0.3.1)
        websocket-driver (>= 0.2.0)
      powerpack (0.1.1)
-     progress (3.3.1)
+     progress (3.3.2)
      psych (2.2.4)
      public_suffix (3.0.0)
      r2 (0.2.7)
@@@ -234,20 -231,20 +234,20 @@@
      rack-openid (1.3.1)
        rack (>= 1.1.0)
        ruby-openid (>= 2.1.8)
-     rack-test (0.6.3)
-       rack (>= 1.0)
+     rack-test (0.7.0)
+       rack (>= 1.0, < 3)
      rack-uri_sanitizer (0.0.2)
-     rails (5.0.6)
-       actioncable (= 5.0.6)
-       actionmailer (= 5.0.6)
-       actionpack (= 5.0.6)
-       actionview (= 5.0.6)
-       activejob (= 5.0.6)
-       activemodel (= 5.0.6)
-       activerecord (= 5.0.6)
-       activesupport (= 5.0.6)
+     rails (5.1.4)
+       actioncable (= 5.1.4)
+       actionmailer (= 5.1.4)
+       actionpack (= 5.1.4)
+       actionview (= 5.1.4)
+       activejob (= 5.1.4)
+       activemodel (= 5.1.4)
+       activerecord (= 5.1.4)
+       activesupport (= 5.1.4)
        bundler (>= 1.3.0)
-       railties (= 5.0.6)
+       railties (= 5.1.4)
        sprockets-rails (>= 2.0.0)
      rails-controller-testing (1.0.2)
        actionpack (~> 5.x, >= 5.0.1)
@@@ -261,9 -258,9 +261,9 @@@
      rails-i18n (4.0.2)
        i18n (~> 0.6)
        rails (>= 4.0)
-     railties (5.0.6)
-       actionpack (= 5.0.6)
-       activesupport (= 5.0.6)
+     railties (5.1.4)
+       actionpack (= 5.1.4)
+       activesupport (= 5.1.4)
        method_source
        rake (>= 0.8.7)
        thor (>= 0.18.1, < 2.0)
@@@ -338,7 -335,7 +338,7 @@@
      validates_email_format_of (1.6.3)
        i18n
      vendorer (0.1.16)
-     webmock (3.0.1)
+     webmock (3.1.0)
        addressable (>= 2.3.6)
        crack (>= 0.3.2)
        hashdiff
@@@ -354,12 -351,11 +354,12 @@@ PLATFORM
  DEPENDENCIES
    SystemTimer (>= 1.1.3)
    actionpack-page_caching
 +  annotate
    autoprefixer-rails
    bigdecimal (~> 1.1.0)
    canonical-rails
    coffee-rails (~> 4.2)
-   composite_primary_keys (~> 9.0.7)
+   composite_primary_keys (~> 10.0.0)
    coveralls
    dalli
    dynamic_form
@@@ -395,7 -391,7 +395,7 @@@
    r2 (~> 0.2.7)
    rack-cors
    rack-uri_sanitizer
-   rails (= 5.0.6)
+   rails (= 5.1.4)
    rails-controller-testing
    rails-i18n (~> 4.0.0)
    record_tag_helper
@@@ -412,4 -408,4 +412,4 @@@
    webmock
  
  BUNDLED WITH
 -   1.13.7
 +   1.15.4