fixed docs make target
Merge branch 'master' into integration