fix compilation issues from merge
Merge branch 'master' into pull-requests