fixed hinting errors
Merge branch 'intern-upgrade' into intern-upgrade-travis-2