Merge branch 'develop' into 'master'

[release] Regular merge of develop

See merge request !256

Gemfile

@@ -45,4 +45,4 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 # Performance-booster for watching directories on Windows
 gem "wdm", "~> 0.1.1" if Gem.win_platform?
 
-gem 'jekyll-spaceship', "0.9.9"
+gem 'jekyll-spaceship', "~> 0.9"

_plugins/hook_email_protect.rb

@@ -5,7 +5,7 @@ Jekyll::Hooks.register([:pages, :posts, :documents], :pre_render) do |post|
   include Jekyll::EmailProtect::EmailProtectionFilter
 
   # Using a simpler version of email regexp
-  email_regexp = /mailto\:(?:[\'\"]*)(?:[\w+\-]\.?)+@[a-z\d\-]+(?:\.[a-z]+)*\.[a-z]+(?:[\'\"]*)/i
+  email_regexp = /mailto\:(?:[\w+\-]\.?)+@[a-z\d\-]+(?:\.[a-z]+)*\.[a-z]+/i
 
   # Take post's content, and transform every occurence of the following regexp (an email)
   post.content = post.content.gsub(email_regexp) {