Merge branch 'master' of https://github.com/philburnett/EntityAutoMapper...

... into develop