Merge "Misc tweak to the APIs."
Xavier Ducrohet [Wed, 20 Feb 2013 18:09:11 +0000 (18:09 +0000)]

Trivial merge