Fixed deserialisation of Time attributes
Merge branch 'master' into production