merged changes related to bug 1114, 2209, 1961 and 1792 into the svn repository

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@8285 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
automatically synchronized identical files to revision 8285

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@8286 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
Merge branch 'master' of github.com:fieldtrip/fieldtrip