Merge commit 'b5a7c2e2'

moose-core/VERSION

-3.1.0-120-g343cb02
\ No newline at end of file
+3.1.0-121-g14cf2df
\ No newline at end of file

moose-core/python/setup.py

@@ -31,7 +31,7 @@ __status__           = "Development"
 import os
 from distutils.core import setup
 
-script_dir = os.path.dirname( os.path.abspath( __FILE__ ) )
+script_dir = os.path.dirname( os.path.abspath( __file__ ) )
 
 with open( os.path.join( script_dir, '../../VERSION'), 'r' ) as f:
     version = f.read( )