Merge with default

--HG--
branch : multipass-stereo
This commit is contained in:
kaetemi 2013-10-06 20:09:25 +02:00
commit 3f1ce6020a