Merge branch 'pullrequest' into docker