-do an autoflake8 here
Merge branch 'master' into rel_1_0