Merge "Fixes for py35"