CSRF error when we try to log data from non-web clients yuck
merge master