Merge "Fix bug 564"

No match.