Fix runscript circular import.
Merge branch 'master' into stable_4