merge changes from 'master' into 1.7