Rebase 3-2-stable with fix for issue #461.

Hi Brian, sorry for the mess with branches. Here there is a pull request that contains the previous fix for the remote validations (already merged in master) and the fix for the issue #461.

I think this is ok. Thanks