Merge "Minor fix + more verbose assert in test to debug issue."
Xavier Ducrohet [Thu, 7 Feb 2013 00:24:47 +0000 (00:24 +0000)]

Trivial merge