Resq stable|master
Merge branch 'master' of github.com:embedthis/farm