Merged

fix for: https://issues.apache.org/jira/browse/AMQNET-314
fix for: https://issues.apache.org/jira/browse/AMQNET-313
2 files changed