Fixed the grammar in the error message.
Merge branch '4.4'