GTD re #80.

Leo build: 20141115191602