Merge from trunk: revision 11070:11071 (Bugfix #6865) Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11071 revision 11071:11072 (Bugfix #6883) Link: https://projects.blender.org/tracker/index.php?func=detail&aid=6883&group_id=9&atid=125 revision 11076:11077 A var was declared twice in the same function, just removing the second declaration. Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11077 revision 11079:11080 Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11080 revision 11090:11091 (Bugfix #6667) Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11091 revision 11133:11134 (Bugfix #6847) Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11134 revision 11137:11138 Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11138