merge in release branch changes (no-op).
Ed Heyl [Fri, 8 Nov 2013 21:23:50 +0000 (13:23 -0800)]

Trivial merge