fix merge bug
Merge branch 'master' into pull-requests