Merge from GitHub

git-tfs-id: [http://falcon:8080/tfs/Projects]$/Phalanger/Main;C5137