Fixing another entity framework bug/issue/problem
Merge commit '0c9f77bbd595e54f44539edc50565ed7ee01d131'