Gae merge to master

combining the versions.