Merge branch '3.0.x' into 3.x

* 3.0.x:
  (Maint) Fix mis-use of rvalue functions as statements
  Add .rspec file to repo root

.rspec

@@ -0,0 +1,4 @@
+--color
+--format
+progress
+--backtrace

spec/unit/puppet/parser/functions/merge_spec.rb

@@ -26,7 +26,6 @@ describe Puppet::Parser::Functions.function(:merge) do
   describe 'when calling merge on the scope instance' do
     it 'should require all parameters are hashes' do
       expect { new_hash = scope.function_merge([{}, '2'])}.should raise_error(Puppet::ParseError, /unexpected argument type String/)
-
     end
 
     it 'should be able to merge two hashes' do