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

diff --combined Gemfile
index addc105d890143fa513f73992875fb11f7d47050,ef14d06c5b86eaed0853550541b81cfa01c8198d..78e2aac976367e24382f51a0eac0c055d2f83d5b
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -55,9 -55,6 +55,9 @@@ gem "record_tag_helper
  gem "rinku", ">= 1.2.2", :require => "rails_rinku"
  gem "validates_email_format_of", ">= 1.5.1"
  
 +# Native OSM extensions
 +gem "quad_tile", "~> 1.0.1"
 +
  # Sanitise URIs
  gem "rack-uri_sanitizer"
  
@@@ -73,6 -70,9 +73,9 @@@ gem "omniauth-windowslive
  # Markdown formatting support
  gem "redcarpet"
  
+ # For status transitions of Issues
+ gem "aasm"
+ 
  # Load libxml support for XML parsing and generation
  gem "libxml-ruby", ">= 2.0.5", :require => "libxml"
  

diff --combined Gemfile.lock
index bdf42eeb69ff03d3c50a676a009337af2e0d8b4c,49f9b5977231da55204cf6ac91542989ba31538b..417a7634a3a2478afefcbe243098a23f015b427e
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -2,6 -2,7 +2,7 @@@ GE
    remote: https://rubygems.org/
    specs:
      SystemTimer (1.2.3)
+     aasm (4.1.0)
      actioncable (5.1.5)
        actionpack (= 5.1.5)
        nio4r (~> 2.0)
@@@ -235,7 -236,6 +236,7 @@@
      psych (3.0.2)
      public_suffix (3.0.2)
      puma (3.11.4)
 +    quad_tile (1.0.1)
      r2 (0.2.7)
      rack (2.0.5)
      rack-cors (1.0.2)
@@@ -361,6 -361,7 +362,7 @@@ PLATFORM
  
  DEPENDENCIES
    SystemTimer (>= 1.1.3)
+   aasm
    actionpack-page_caching
    annotate
    autoprefixer-rails
@@@ -404,7 -405,6 +406,7 @@@
    poltergeist
    psych
    puma (~> 3.7)
 +  quad_tile (~> 1.0.1)
    r2 (~> 0.2.7)
    rack-cors
    rack-uri_sanitizer