Took out comment
Bumped version
Merge branch 'hotfix-1.6.14'