Merge branch 'master' into saiku3