cleanups.
Merge remote-tracking branch 'origin/spring-gx-dallas-2014' into spring-gx-dallas-2014