NH-2692 - Pull commit to 3.4.x

Pull 4c074c2328865788e301d5c987e40960bd2176ab commits to 3.4.x

https://nhibernate.jira.com/browse/NH-2692