Update to fos-user dev-master