Fix server-time parsing
Merge pull request #363 from henrikhodne/fix-server-time-parse

Fix server-time parsing
Merge branch 'master' into 3.0.0