Merged revision(s) 1185320 from activemq/activemq-dotnet/Apache.NMS/branches/1.5.x: