Merge branch '4.x'

Author: adrienthebo

Gemfile

@@ -11,7 +11,7 @@ def location_for(place, fake_version = nil)
 end
 
 group :development, :test do
-  gem 'rake',                    :require => false
+  gem 'rake', '~> 10.1.0',       :require => false
   gem 'rspec-puppet',            :require => false
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'rspec-system',            :require => false