stuff in 3.7dev not yet on 3.6