ported fix from 3.1
Merge pull request #112 from occamlabs/oracle-timestamp-fix-3.2

Fix oracle timestamp conversion