Left-over line removed
Merge branch 'hotfix-2.1.17'