Fix error running functional tests under Ruby 2.0.0
Merge remote-tracking branch 'upstream/master'