Merge branch 'gae' into touch
Merge remote-tracking branch 'origin/logic' into touch