Another merge problem...this comment was supposed to go with line 140 (the "/// <returns" comment)