merge from github

git-svn-id: https://riouxsvn.com/svn/svn-in-action@2 8234cfe3-e3ca-4e1d-ba36-4210a067f239
merge from github