use microseconds instead of just secconds
Merge branch 'master' into rails-4

* master:
  use microseconds instead of just secconds