Merge branch 'master', remote-tracking branch 'origin'
Fixed chmod to be compatible with pre ruby 1.9.3