Merge branch 'master' into soc-2013-depsgraph_mtsoc-2013-depsgraph_mt

Conflicts:
	source/blender/blenkernel/intern/constraint.c
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/scene.c
	source/blender/blenkernel/intern/shrinkwrap.c
	source/blender/collada/AnimationExporter.cpp
	source/blender/editors/space_image/image_ops.c
	source/blender/editors/space_view3d/view3d_view.c
	source/blender/makesrna/intern/rna_scene.c
	source/blender/modifiers/intern/MOD_util.c
	source/blender/render/intern/source/pipeline.c

1 files changed, 1 insertions, 1 deletions

diff --git a/.arcconfig b/.arcconfig
index 57f6c39f1ea..8fc370a94ac 100644
--- a/.arcconfig
+++ b/.arcconfig
@@ -1,6 +1,6 @@
 {
 	"project_id" : "Blender",
-	"conduit_uri" : "http://developer.blender.org/",
+	"conduit_uri" : "https://developer.blender.org/",
 	"git.default-relative-commit" : "origin/master",
 	"arc.land.update.default" : "rebase"
 }