Changes from RubyMine