Fixed bugs caused by automatic rebase of rubymine.... :-(
Merge remote-tracking branch 'origin/master'