merge from default
merge from default

--HG--
branch : matlab-extract

dagophil/vigra,timoMa/vigra,dstoe/vigra,kod3r/vigra,psteinb/vigra,martinsch/vigra,cha007/vigra,psteinb/vigra,mmuellner/vigra,funkey/vigra,hmeine/vigra,dstoe/vigra,dstoe/vigra,funkey/vigra,capturePointer/vigra,stuarteberg/vigra,funkey/vigra,DaveRichmond-/vigra,capturePointer/vigra,cbecker/vigra,timoMa/vigra,stuarteberg/vigra,xiwei-zhang/vigra,capturePointer/vigra,dagophil/vigra,stuarteberg/vigra,funkey/vigra,psteinb/vigra,DaveRichmond-/vigra,funkey/vigra,DaveRichmond-/vigra,cha007/vigra,stuarteberg/vigra,cbecker/vigra,mmuellner/vigra,mmuellner/vigra,funkey/vigra,timoMa/vigra,dstoe/vigra,timoMa/vigra,stuarteberg/vigra,xiwei-zhang/vigra,timoMa/vigra,cha007/vigra,psteinb/vigra,ThomasWalter/vigra,kod3r/vigra,mmuellner/vigra,mmuellner/vigra,hmeine/vigra,mmuellner/vigra,DaveRichmond-/vigra,dagophil/vigra,dstoe/vigra,dagophil/vigra,hmeine/vigra,xiwei-zhang/vigra,cbecker/vigra,ThomasWalter/vigra,ThomasWalter/vigra,capturePointer/vigra,ThomasWalter/vigra,dstoe/vigra,psteinb/vigra,cha007/vigra,ThomasWalter/vigra,dstoe/vigra,cbecker/vigra,xiwei-zhang/vigra,psteinb/vigra,ThomasWalter/vigra,DaveRichmond-/vigra,stuarteberg/vigra,martinsch/vigra,capturePointer/vigra,xiwei-zhang/vigra,cha007/vigra,cbecker/vigra,hmeine/vigra,kod3r/vigra,xiwei-zhang/vigra,cha007/vigra,martinsch/vigra,kod3r/vigra,hmeine/vigra,hmeine/vigra,martinsch/vigra,hmeine/vigra,funkey/vigra,cha007/vigra,dagophil/vigra,timoMa/vigra,cbecker/vigra,stuarteberg/vigra,capturePointer/vigra,psteinb/vigra,kod3r/vigra,martinsch/vigra,DaveRichmond-/vigra,dagophil/vigra,DaveRichmond-/vigra,xiwei-zhang/vigra,mmuellner/vigra,capturePointer/vigra,martinsch/vigra,dagophil/vigra,timoMa/vigra,kod3r/vigra,ThomasWalter/vigra,kod3r/vigra