GTD re #38.

Leo build: 20141115185900