Another big patch set by Bastien Montagne, thanks a lot!

* Made Freestyle optional (turned on by default).

* Fix for missing bpath.c updates in the previous merge of trunk changes.

release/scripts/startup/bl_operators/__init__.py

@@ -22,12 +22,11 @@ if "bpy" in locals():
     from imp import reload as _reload
     for val in _modules_loaded.values():
         _reload(val)
-_modules = (
+_modules = [
     "add_mesh_torus",
     "anim",
     "clip",
     "console",
-    "freestyle",
     "image",
     "mesh",
     "node",
@@ -44,15 +43,17 @@ _modules = (
     "vertexpaint_dirt",
     "view3d",
     "wm",
-)
-__import__(name=__name__, fromlist=_modules)
-_namespace = globals()
-_modules_loaded = {name: _namespace[name] for name in _modules}
-del _namespace
-
+]
 
 import bpy
 
+if 'FREESTYLE' in bpy.app.build_options:
+    _modules.append("freestyle")
+__import__(name=__name__, fromlist=_modules)
+_namespace = globals()
+_modules_loaded = {name: _namespace[name] for name in _modules if name != 'bpy'}
+del _namespace
+
 
 def register():
     bpy.utils.register_module(__name__)