Test case
Merge branch 'master' into issue-16

Conflicts:
	tests/bugs/issue-54/Issue54.chs
	tests/test-bugs.hs
Fix #16: also improve LINE pragma handling