Fix makedoc according to new source paths
Update rubylib
Merge branch 'master' into dev