- Verify `values` in conjunction with `expect`
# See issue #313 - no bug here; the problem is the deprecated multi-value annotation
- QA: Simplify values_with_expect() test
- Fix issue #313: Expected exception not considered
# Really resulted from parsing being stopped after a deprecated
# multi-value annotation was encountered
Merge remote-tracking branch 'upstream/master'