Merge branch 'master' into rails4_merges_master_3rd

Conflicts:
	lib/active_record/connection_adapters/oracle_enhanced_schema_statements.rb

Tab character conflicted.
Merge pull request #300 from yahonda/rails4_merges_master_3rd

Merge master branch commits into rails4
Due to rails 4 master remove to_sql, so also remove here

https://github.com/rails/rails/commit/1c9f7fa6e17d3b026ad6e0bc1f07a9dd47d8a360