Merge "Minor API fixes."
Xavier Ducrohet [Fri, 15 Mar 2013 20:57:39 +0000 (20:57 +0000)]

Trivial merge