Saiku3 trunk merged with master