Correct function name
Merge branch '7.x-1.x' into debian
Update for v1.1-1