Merge in recent changes from v3-stable

middleman-cli/lib/middleman-cli.rb

@@ -29,7 +29,6 @@ module Middleman
 
       desc 'version', 'Show version'
       def version
-        require 'middleman-core/version'
         say "Middleman #{Middleman::VERSION}"
       end
 
@@ -86,6 +85,9 @@ module Middleman
   end
 end
 
+# Require the Middleman version
+require 'middleman-core/version'
+
 # Include the core CLI items
 require 'middleman-cli/init'
 require 'middleman-cli/extension'