Fixed a NRE during an equivalency assertion when a nested complex expecation is null.
Merge branch 'master' into Release-3.0