handle AmbiguousTimeError better
py3 compat change: don't extract get_allocation()
Merge branch 'next' into py3