Prep for 5.7 release
Merge branch 'dev' into python3