Merge changes from rails-sqlserver repo