Merge branch 'patch-5' into 'stable-3.1'

Update rest.php to check if remote api is allowed.

See merge request !893