timedelta.total_seconds does not exist in Python 2.6 yet
Merge branch 'master' into next

* master:
  timedelta.total_seconds does not exist in Python 2.6 yet