add stub for getTime()
Merge remote-tracking branch 'upstream/master'