Merging with Ryan's except MapGuideView
Merge branch 'jackie'