Prepare release
Correctly parse single-line @expectedException annotations
Merge pull request #890 from igorw-forks/single-line-expected-exception

Correctly parse single-line @expectedException annotations
Added the changelog entry for #890.
Merge branch '3.7'