Fix line number reporting for while loop tests.
Merge from upstream.
Merge remote-tracking branch 'upstream/master'
Fix set == and !=.
Merge pull request #260 from rixner/master

Fix while loop error reporting and set equality