Fix handling of 404.
Merge branch '7.x-1.x' into Gizra-198

Conflicts:
	restful.module
Fix merge conflicts.
Merge pull request #212 from mateu-aguilo-bosch/Gizra-198

Merging c792970