Merge branch 'master' into saiku3
Merge branch 'saiku3' of github.com:OSBI/saiku into saiku3