Merging r57392 through r57521 from trunk into soc-2013-motion_track


git-svn-id: https://svn.blender.org/svnroot/bf-blender/branches/soc-2013-motion_track@57522 954f8c5b-7b00-dc11-b283-0030488c597c