Merge branch 'dev-remove_extra_timedims' into 'master'

Time aggregation functions: Remove unneeded extra time dimension in certain cases

See merge request !78