Updated from version in merge request 1762 - http://www.gitorious.org/statusnet/mainline/merge_requests/1762