Combined optical and electrical characterisation of minority carrier lifetime in solar cells