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

diff --combined app/controllers/site_controller.rb
index 265901bec7e3cdf92cf086c4cd317dffe715325a,ad19df50e463bd1b292457a369534a2aa351b89e..8b742a585c0e8f7519fb1019222cbcf88216e513
--- 1/app/controllers/site_controller.rb
--- 2/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@@ -18,8 -18,7 +18,7 @@@ class SiteController < ApplicationContr
  
    content_security_policy(:only => :id) do |policy|
      policy.connect_src("*")
 -    policy.img_src("*", :blob)
 +    policy.img_src(*policy.img_src, "*", :blob)
-     policy.script_src(*policy.script_src, "dev.virtualearth.net", :unsafe_eval)
      policy.style_src(*policy.style_src, :unsafe_inline)
    end