Merge branch 'blender2.7'

Conflicts:
	source/blender/blenkernel/intern/library_remap.c

source/blender/blenkernel/intern/library_remap.c

@@ -287,6 +287,13 @@ static int foreach_libblock_remap_callback(void *user_data, ID *id_self, ID **id
       if (!is_indirect || is_obj_proxy) {
         id_remap_data->status |= ID_REMAP_IS_LINKED_DIRECT;
       }
+      /* We need to remap proxy_from pointer of remapped proxy... sigh. */
+      if (is_obj_proxy && new_id != NULL) {
+        Object *ob = (Object *)id;
+        if (ob->proxy == (Object *)new_id) {
+          ob->proxy->proxy_from = ob;
+        }
+      }
     }
   }