Merge branch 'passenger-support' into passenger-rails4