Use the 'old' hash syntax to stay compatible with Ruby 1.9.2
Merge remote-tracking branch 'origin/master'